Additional work on the catalog module

- Create and use entites with the right way.