Added support for a type checked model