Now using HashWithIndifferentAccess rather than plain hash