Keep backward compatibility for endpoints