CLSN-1827do not map cs-model unless asked...
code changed for Performance