WIP: Added new log collector