Add "$arch" parameter to provide support for other architectures (tested with x64 and i586)