Use swagger PR branch until its merged
WIP update models