Improve setup of mappings