Add args management for sender