Support for List and Map

My question about non-primitive collection types applies here too.