SC-67 Refactorings
SC-69 Swagger update