Expand the context to allow more hand-created options and constraints.

Important to allow more domain knowledge not derivable from the advertisement