General update to handlers.