Added Location Scaffold