Improve configurability of mappings.