Fixed encoding declaration
Refactored Value Object to use enum type
use xxx.label instead of get_xxx_display method