Add big support for chart
Remove duplicate code