Aligned ORM mapping to latest modifications to data model.