I would have thought that this would be an opportunity to use linked content controls and include those in the building blocks where appropriate.

__________________
Andrew Lockton
Chrysalis Design, Melbourne Australia