Added the initial version of hot swapping