Udated build process