Modified Entity Structure, has to be a map now.