Refactoring content and label providers