As technically the signatures for these functions are different from SectionsDatasource, the function name should be changed as well