Added TimeKeeper class