Porting DataSource from PPI 2.0 over to 2.1