Some reorganization
Add value of data results