Update on Base App to support the latest geo-platform updates