Additional work on the "Catalog" module