Update to use safe_load