Add some type annotations