Added machine list capability