Made builder API for PI private