Refactor to support more charts and actionable alerts