refactored content and label providers