added location handling in wine object