Added category option to individual commands