Added address adder and sample map (not working yet)