Make them more flexible, reusable. This is a precursor to porting over python md provider code from another branch.