Hotfix/mapping

@dennisvdvliet Simplifies mapping and initialisation code.