Some Changes to Gorm