Added DiagramContainer and DiagramObject classes