Added lazy evaluation of model type fields