Refactor receiver classes