- Added some more typings