Changed type hinting