- Added more typings