Add upgrader support