Remove support for collection of complex values with the same name