[GRAM-57] Make DateTimeDecorator more flexible and change the utilization of it in other classes