Abstract model more - break 'make check'