Added more handlers.