Upgrade EntityAPI