Changed to use ChaliceDate and ChaliceSource objects
Authored by: ross_drew 2010-09-27
Parent: [r15]
Child: [r17]