WIP: Add default constraints to some models

This is a first shot at what is being discussed in issue #1105