Fixed small bug in serializer base
Refactored infrastructure building for TradeEngine