changed location node to addressRange, added properties