Add CalculatedField. Pad out others.