Few changes on idp.pp