Add suit conformance
Add rework