Moved time parsing to a new utility class