Catalog implementation in progress