Started implementing a proper entity factory and wrapper for all catalogues.