Added custom and spring event handling capabilities.