change the charts to core and models