Add more useful methods and events