Added support for addrindex during installation.