Add more fields for location