Work on tag and whitepaper assoc