some tweaks with hot swapping models to make it more robust