Added ability to categorize labels