More swagger and models