More type hinting