Partial refactoring towards a common Builder interface