Better handling of fetching parameters