Update builder version
Fix style
Add Build