Switching targeted over to the new Senderable class