Add more type hinting