Added some neccessary typing