Added arch detect