TODO: Adapt and include UPGRADE from main repo