added temporary support for timer