Extension for HotSwap