added context schema, added the option to all queries