Adding some of the other components