Updated handlers.