Enhanced wait_for's logging

Enhanced wait_for's logging