Added GLM support