Added optional default field values and DateTime field