Adding some more advanced handlers