ITER-1 | refactor to builder