Added more constraints checks