Added some hash index code