Code improvement to DataHolder.js