Added two fields to User