Infrastructure and queries added