Add constraint solver