Add ENUMERATED encode / decode