Implemented Timer and adjusted classes which are affected