Added a new entity implementation