Improve location feature