Change Entities encode/decode order