More type annotations