Same here - should be a service on its own