Added a bunch of common entities (e.g. mash) on top of those used in the spec.