Added player_id to Unit