Add support for multiple consumers