ADD Subset constructor
OPT on the query generation