- Improved mappings.
- Added helper.