2.4.x compatibility

Looks like commit 205eda8b33 broke this module, it removes the Observer classes and moved them instead to the main classes. I have migrated the code to override this new function instead.
Testing for this is still ongoing.