#945 - Further changes to the catalog model