Additional work on the catalog module - missed files