Refactor build task
Update