fixed entity service