More OGL 3.0 compliant.