Move authentication into service