Added Entity interface