Add default sender
Moving pagination to separate module