Added some category work