Issue #36

Add more granularity to constraint validation