Upgrade and pin mapentity