Updated features support for entity based VMP