Adding support for collections with dots