Arjen move functions to service