Added table generate queries