Extend model loader to support model-upgrade (part 1)