Added support for plots POI as well as charts