P.I.S.: Optimize loading performance

Optimize loading performance