All changes for maps studio functionality