Add support for special events