Timer support added