Refined the Mapping module. Refactored the Catalog module to use the Mapping module.