Fixed wrappers and authRepository