Implement hot swapping