TimeTool and timetool objects added.
Refactored