Added Client-detection