Move loading of machines to config