Move utils to a service