Removed class constraint on few collection generators