Updated to accomodate new fields