Adding support for 12/24 hour time