Modified add and remove methods to bind this to handler