Adding schema and query sections