Added fields to controller