Added some new handlers