Add support for firing and idle event