Number bar chart, data model refactor