Data model layer decoupled