Modified build process and Connect