Added more specific time handling.