Updated for shared components