Rewritten decoders
Merged few things between host and client sides