Updated to take advantage of new carbonAPI features