Added generic handlers.