Fix mappings
Move Location