switch to use dictionary as index store