Add flags for machin count wait