Add new mappings, reorganize stuff