Restore commands and refactor. Enable sender.user.