Added support for naming constraints