Added type annotations