Updated Player and Unit Classes