[CH] Data management refactoring
[BUG] logic error creating data instance