Added categories, and autodiscovering the categories.