Refactor tagging block classes