Refactor Builders\ClassBuilder