More complete type annotations