Add other operations to listener hack