GEO refactoring