Fix nested resources. Add Category