Refactor strict mappings enforcement. Now it is validated at the model level.