Finish Address Index porting