Added Client aware services