add expand methods to index, and dependency mappers