Builders refactored for better class scoping