Added types + player states