Added Base Entity Class