Added QueryOptions generator class