Added some component definitions.