Prep for component sets :heart: