Update with changes for new Build System