Make parameter type more generic
Datetime dep removesd; Refactored; REQUIRE