Updated with GetSafeContent