Add options to support different architectures builds