Lots more changes, mainly arround new mappings