Added primitive class and logic diagrams