Remove endpoint type requirement