Add classes for Graph queries