Add Model to CristallValue and migrate data to model
Update cmake file