Switched to raw queries