Now we have native maps
Manual merge