Updated to build standard archs