Refactor build using OASIS