More intuitive symbols on diagram
Add missing rules to cpr