Updates to components to support project work