added implementation of a sender, need to discuss with team