Added some component store stuff!