Refactor monkey tuple mapping