Update to new CompCore