Added additional query support