More changes for ElConCore