Added missing fields back in