Added EndPoint
Added predictions
using EndPoint for endpoint addresses ;)