More constraints on solutions and better sample data generation.