Change catalog management to better handle creation