Schema renamed to Entity