Update: Include date/time mapping routines.