What has there been a shift toward broadening the focus beyond?