Using the Options class instead of Quintet
sprint-2617
sprint-2617 Correcting some swagger related bugs