beck to previous version - check model class (BAC-297)