Better handling of different time-formats