Made role not nullable
Fixed up entity relationshps