Done code logic, to add collectors