Add logic for senders and implementation of the persitence model