Fix Javadoc
Add more string converter mappings