0.9.7 raise
Fixed for PMContext build errors
Added PMOptional