Added support for empty collections