Making discovery package more easily swapped