Added category functionality