Updated CatalogManager and ExerciseQueue