Refactored build methods