Add better time format