Add context support for collection