Updates

Update database code with datasourcerest configuration