Add multiarch support