Renamed file and added better time support