Replace whenAvailable with filterAvailable
Replace defaultConfig with mutable config object