Added Location object (lazy)
Fixed code to populate the location list correctly