Add support for List and Set wrappers