Add support for moses_chart. Cleaning up needed.