Updated deprecated class import and type hinting!