Add contextual fetches to DBI
