Unify plotting code, add new chart