PDIO-353 Better engine developer experience