Added locationGroup and userId