Added StepDto, EntityDto