Modified runtime queries