Use separated catalogs for better performances