Added subset generation