Added address formatting