Add ability to override constraint options