Initial addition for List and Set support