Add some more typehints