Major functionality to charts added