BS-10854
Add constraint validation