Rerote some parts of this module to use datacat module