Upgraded to hashie 2