Switched to GLM and removed dependecy on Thor.