More refactoring. Moving revalidation to a subscriber rather than collaborator