First draft query tables