New DB structure - fix playerTank and Battle