Add support for Multiple service endpoints #26 #11