Replace whenAvailable with filterAvailable for simpler configuration