Modernized type annotations