Use full mappings (fixes shifter); Limit poller to first 2 mappings