Expand on endpoint core