added support for new-style collections