Implement builders for suboptions and fix build