Charts - Migration to v4.0