Adds address calculation