Improve service detection (better auth)