Add more type annotations