Scala builders refactored