Added some type hinting