Extended support for custom collections and structs