Added initial build feature