Bug-fixes && Added Date & Datetime field types