[BUGFIX] Notifications and old method calls