Changed to support multiple architectures