Fix Entity Class