Adds support for multiple architectures