Fix generate model fields