Incomplete commit 3. Solving geoinfo inclusion