Updated container remove / add
Iterator update
Functions name update
Time function name clearer :)