added fields to user, address