Refactor the build script
Fix the build script
Update list