ORII-27 Persistent Data Model
work on some constraints and defaults