Added ability to include options when creating constraints for the constraint node