Closes #638, deprecating MX mapping inputs