Feature/collector plugin improvements