Several changes (Faucet, Endpoints, Send..)