Added key components and panel