Added fields, preparing for GoSQL