- added Timer support