Refactor the sample with changing name
Update configuration part 1
Remove validator temporary