Improvements and Endpoint discovery implementation.
Removed redundants.