Moved data sources to properties for easier extensibility/customization.