Removed duplicated code between common and smart entity.
Merge pull request #2 from HeptaSoft/FirstImport

Removed duplicated code between common and smart entity.