Switch to use data tables from resource server