Added fields for margin