Added APIHandler, Simplified addrindex