Added pedantic model check