Implemented a new class to manage timekeeping in the service
Minor edits