improved PicketLink IDM integration
Fixed imports