Added type hinting