Updated user class to include all fields