Changed UML to reflect CC and EC a little better