Added support for the new listen_on_device option