Added encoder/decoder for some systems