Scala builders refactored 2