Improving operations for PSFS

Improving operations for PSFS