added source and uid fields