Added AdminController and CatalogController