DB Performance

DB Performance and WS changes