Remove override modify method
Add DateTime helper class