Stronger model typings