Refactored location and some others