Devel: Upgrade inner functionality