add support for PI endpoints