[REFACTORING] Value format updated