Continued refactoring and unification between chart types