Moved class to allow compilation of Endpoint dir