Upgraded to latests chart.js and refactored Chart classes