Add metadata blocks to comments