Adapt auths
Added service class