Add more constraints