Improve lifecycle management & move collector limiter to consumer.