Fixed category handling - now a collection