Added raw query for testing