Breaking out endpoint calls