Added some extra handlers