Added category management