Simplify EntityList
Simplify all EntityList subclasses
Merge branch 'simple_lists'