Added some category handler