Add shape doc references
Add more constraint references