Ability to list by category or identifier
Saner(?) class naming