Adding some basic model specs, removing auto generated stuff