Switching to use safe_yaml