Added fields to hold data