Refactor mapping setup for MFi controllers