Refactor block collector classes and add report on rendered blocks