Remove PSR from loader and change session timeout