Reworked time classes