Updates to support shared base content model