Fixed data model interface
Added conditions