Add support for Time and Timestamp
Remove unnecessary Override annotations