Small improvement to CoreModelData.class.php