Added more models to conform to the swagger spec