Added address verification