More type annotations?