Added 'subset' option