Added support for DateSource class. This will be good in the future!
TODO: Implementing a Interface between activity and data objects (ongoing)