Readd parsing of mappings object to JSON

- Improve to integer conversion
Improve logging