PBA - add draft functionality