Swap Notify core support
Fix memory leak