Add index lookups and queries