Transaction query support added