Extracted build helper classes