Simpler enums and more callback events