Add callbacks and fix the super method call