Removed dependency to swagger