Removed workaround for missing properties
full encoder and decoder