Using model_name and system model properties

Using model_name and system model properties #1880