Implement IGEOLO support #531