Added new feature for easier CC support