Add log collected stats. Refactor and rename annotations.