Migrate to new chocolate version (0.4)