Improve template for location