Last changes required for new catalog import