Add support for schemas