updated times conditions

-Updated the times conditions for being able to set the comparisonType
to GreatherThan, LesserThan, Not or Between.
-Mapping improvements for conditions