Adding mapping to appropriate API to populate Site fields and finished deprecating any non-class based provider support.