Various updates including CC API modifications