Bug fix

Internal the IEntity is used, external the IViewModel