Fixed implementation of model index factories