Removed useless base Entity