Added abstract entity service