Made User Model respect schema