Added a BUNCH of semi-functional data management