data providers added, client-side improved