Adds initial support for custom events