Added Address fields