Updated imports and command registrars for updated Mbapi