Added Player1 and Player2 tag support to everything