AG-3511: added schema
Validation in engine: migrate from Nonnull to NotNull