Added some component structure.