Added some component stuff