Refactoring the content and label providers