Added a self keyword to Waldo so that can add yourself to endpoint
lists and maps.