Comment change
Add new keyword-type specific constraints