Update Model
Fixed roles
tidy