Added support for embedded entity set.