Improvements. Added entityaggregate and entitytaxonomy levels.