Added DataType Calender to core.xcore file
Replaced all the references to Data datatype with the new Calerder dataType
Updated ModelUtils class