Added builder for constraints
Modifications to the builder.