Add Data fields and adjustments