Add lifecycle management to collector agents