Refactored report.js - added DataContext.js