Update: Include more methods for date/time mapping.