Add better location information