Use record syntax for User value
Merge branch 'postgres' into postgres-fay