Added mappings
Conflicts