Update Location --> new architecture for solution