Upgrade to correct persistence entities