Removing BusEndPoint. Better using strings