Updated struct Time for future features