Added some basic model components