Add entity factories
Remove abstract entity service