Refactoring of the code#72

flopezag wants to merge 4 commits intomastersmart-data-models/data-models:masterfrom

hardening/test_data_modelsmart-data-models/data-models:hardening/test_data_modelCopy head branch name to clipboard