Dependencies to Chartoon Core refactored