Support for default per-entity constraints #32