Added the other two components and their embedded subcomponents
Modified several properties to ensure default values cannot be changed