0.0.5: Handle different time format