Added basic support for other events