Added components and structure.