[IMP] - improve the definition of this module, migrate this to the new api version