add :map-nowait to new feature