Rewrite and add effuse.yml support