Ensure data-model store has id