[APOLLO-2645] - updated entity to use date time