Added more expand functions for PBVI.