Added support for collection-based methods