Endpoints as a List instead of Map