Add some type hinting