Tradeserver Improvements