Refactor + Exec + YAML