Catalogue refactor complete