Changed helpers in services