Fixed mapping helper
Simplified helpers and made easier to use