refs #235

Added fields and conditions.
Still waiting for reply of additional questions.