Added partial support for simple schema