new indexers and support for av work in data maker