Some progress in index implementation.