Bugfix for slave notification objects.
Implemented some more dynamic macros.