Refactoring of entity service
[service, entity] Refactoring of entity service
Fixed entity service