improved Schema class