According to an example embodiment, a method may include receiving, by a user equipment from a serving base station, a location update request; selecting, by the user equipment, a plurality of base station transmit beams including a beam for the serving base station and a beam for each of one or more non-serving base stations; determining, by the user equipment, a beam direction of each beam of the plurality of base station transmit beams; determining angle information including an angle between beam directions of one or more pairs of beams of the plurality of base station transmit beams; and, sending, by the user equipment to the serving base station in response to the location update request, the angle information, and a beam identifier identifying the selected beam for each of the one or more non-serving base stations.