Fixing adding of addresses. Doing post handling properly