Expanded class hierarchy of Time