Updated entity service