Aligned ORM to latest contratti tables modifications.