Added origauthor field
Fixed datamodel warnings