Adding new convenience categories and subclass

Some more wonderfully convenient additions. You won't hate these.