Last touches before User model