Add full fledged date and time implementation