GML support and code refactoring