Added support for model based validation