Improve selection of hardware and software locations