Fix Interface Inheritence And CoreDiagram Update