#11 Code refactoring in catalog resources