Added separate time and interval clocks