Updated the checking of model structure. Related to ticket:2881