added interface waiting infrastructure