Changed domain model slightly for StepData inport files