enhance fetch support