Added some extra typing