Added EntityCollection and test