Do we really need to create a service here? Can we re-use the existing one?