Updated design to match addresses sent as ints