Added subcompnents