Support for further amendments
Support for more notification handlers