Changed Tank PK to uid