Minor changes to create catalog interface