[Logic] builder update