Added initial build logic