Added type annotations to types