Added support for old-style collections