Make step dynamic with reflection
Extract super class builder
Extract builder class
Remove typo