Ported Cherry partially to new API
50 files changed