Updated entity models ---- char to string
Merge commit '9dd3df429d2090179cca623d79bcf9a21e7a8dec'