Added hot swapping String