Modified entities
Merge branch 'master' of https://github.com/crististaicu/sdm-project.git