CC make supported calls more better