Added `untilResolved` feature