added check existing entities
Merge branch