List and Set improvements