Hopefully final refactoring into IgluAdapter