Added stuff for charts