Added more constraints