Moved the natural key field types map onto the decorator, as the base model only needs to hold enough information to derive it.