Added some type annotations