removing unnecessary dep on List::Util
be just a tad stricter
adding entity_groups
reflect change