Added use-system-binary option