[#2787] Add more enums and correct data binding.