added shared components