Upgrade to Empire 0.8.4