Add base and tracking queries
Add graph queries
Add metric queries