Added some location features and bootstrap