Made `location_locked` optional