Added number format to values