Added overloaded mappings. Fixes #1283