add option to include location data