Upgrade remaining classes to Hashie, added Tax.