Modified DataSource for new remote JSON format