Added multiarch support