reworking generation with catalog file