Move helpers to Service/