Add support for nested collections