Added some more models stuff