Fix Entity syntax