wip: Fastest load of catalog w/ definition