auto model fields improved