Moved callbacks to instance variable