added location, locale field