Updated CC addon to use new features in Core