Added type-hinting