Add new datasource method and comments