LOcation Management added