- Added more types
- Fixed typo