Moving forward with long term Mapping Agreement