Added some handlers.