added more typing information