Cleaning of methods and better management of Pending

Now Pending is Type-Safe;
Cleaning of some imports i used to test the methods and classes;