New version of datamodel library

Just some improvements and fix for null fields in JSON