Reworking of OpenGL wrappers