More Catalog Controllers updates

More Catalog Controllers updates