Add SingleEncoding to weaver
Update Changes