Modified GPMap and Octree