Updated the interface of Entity