More endpoint formatting